feat(sagemaker): Merge SageMaker SSH Kiro integration#8589
Merged
laileni-aws merged 246 commits intoaws:masterfrom Feb 24, 2026
Merged
feat(sagemaker): Merge SageMaker SSH Kiro integration#8589laileni-aws merged 246 commits intoaws:masterfrom
laileni-aws merged 246 commits intoaws:masterfrom
Conversation
aws#2330) Create ~/AGENTS.md with SageMaker Unified Studio context when the AWS Toolkit activates on a remote SMUS Space. Uses HTML comment markers to manage a section within the file, preserving any user content outside the markers. Prompts the user before modifying an existing file that doesn't have markers. ## Problem When users connect to their space through their IDE, the code generated through the IDE lacks context about the user's project. We are adding an AGENTS.md and a context file that provides smus-specific context about the user's space. ## Solution When the AWS Toolkit activates on a remote SageMaker Unified Studio Space (isSageMaker('SMUS-SPACE-REMOTE-ACCESS')), it runs createAgentsFile() which creates AGENTS.md and links a separate smus-context.md to it. The AI agent picks this up and gets SMUS-specific context. -> If AGENTS.md doesn't exist, we create smus-context.md and a new AGENTS.md that just imports smus-context.md. -> If AGENTS.md does exist and there is no import statement, we prompt the user to modify their AGENTS.md with the import statement, and create smus-context.md. We do not overwrite any of their changes. -> If somehow smus-context.md exists but is not imported in AGENTS.md we can still write to it, but we shouldn't touch the AGENTS.md. That would mean a user doesn't want SMUS-context.md imported every time and we should respect that. ->If AGENTS.md exists and has the import for smus-context.md, we just write to SMUS-context.md without prompting the user. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: Ziwei Ba <ziwikiwi@amazon.com>
## Problem These merge artifacts were discovered when comparing the feature/smus-m2-kiro branch to the staging branch. - Entry for aws.smus.refresh command in toolkit/package.json - Duplicate amazonq changelog entry ## Solution Removed the changes. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: Bhargav <bhargavavaradh@gmail.com> Co-authored-by: Ziwei Ba <ziweichristina@gmail.com>
## Problem - New feature requires change log ## Solution - Added change log for new feature --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: Bhargav <bhargavavaradh@gmail.com> Co-authored-by: Ziwei Ba <ziweichristina@gmail.com>
|
⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done |
|
✅ I finished the code review, and didn't find any security or code quality issues. |
gniumg-source
added a commit
to gniumg-source/aws-toolkit-vscode
that referenced
this pull request
Feb 23, 2026
Open
gniumg-source
added a commit
to gniumg-source/aws-toolkit-vscode
that referenced
this pull request
Feb 23, 2026
ef04fe6 to
df23b88
Compare
dylanraws
approved these changes
Feb 23, 2026
Will-ShaoHua
approved these changes
Feb 23, 2026
bhavya2109sharma
approved these changes
Feb 23, 2026
vpbhargav
reviewed
Feb 24, 2026
Comment on lines
-75
to
-82
| // Check for any VS Code fork process | ||
| execFile('tasklist', [], (err, stdout) => { | ||
| if (err) { | ||
| resolve(false) | ||
| return | ||
| } | ||
| resolve(IDE_PROCESS_PATTERNS.windows.test(stdout)) | ||
| }) |
Contributor
There was a problem hiding this comment.
Seems like this should already handle Kiro also, no?
Same across the other changes in this file..
Contributor
|
/retryBuilds |
|
⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done |
|
✅ I finished the code review, and didn't find any security or code quality issues. |
laileni-aws
approved these changes
Feb 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
SageMaker Studio currently supports the ability for customers to connect their local VS Code IDE to SageMaker Spaces from the AWS Toolkit extension, but this is not supported for the Kiro IDE due to the Remote SSH extension for VS Code not being supported.
Solution
Merge staged feature enhancement which allows SageMaker Studio customers to connect to Spaces from the Kiro IDE. This includes the sagemaker-ssh-kiro sidecar extension as a scoped-down replacement for the Remote SSH for specifically SageMaker use cases, which will be installed on-demand with user consent when needed during the remote access ingress.
This PR includes a changelog entry.
feature/xbranches will not be squash-merged at release time.